Rename core.repo-finders to core.default-repo-finders

This renames a config key to make its semantics more obvious. Despite
what the commit message says, it only applies when a set of repo finders
is not specified (either on the command line or in a library API call).
This also renames the corresponding ostree_repo_get function. We can do
this since it hasn't been released yet.

Closes: #1763
Approved by: pwithnall

diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt
index a91663ed50faf5aed85118a29864b959f643c27f..5dbafc5fdfe19a0e12d7250abb742d2438f7ec8d 100644 (file)
--- a/apidoc/ostree-sections.txt
+++ b/apidoc/ostree-sections.txt
@@ -298,7 +298,7 @@ ostree_repo_get_mode
 ostree_repo_get_min_free_space_bytes
 ostree_repo_get_config
 ostree_repo_get_dfd
-ostree_repo_get_repo_finders
+ostree_repo_get_default_repo_finders
 ostree_repo_hash
 ostree_repo_equal
 ostree_repo_copy_config

diff --git a/man/ostree.repo-config.xml b/man/ostree.repo-config.xml
index 3ea2448615fe2f123779b78b4a3822162f0299ea..acaa3be544e791314b361d790e3284642a8341e3 100644 (file)
--- a/man/ostree.repo-config.xml
+++ b/man/ostree.repo-config.xml
@@ -217,7 +217,7 @@ Boston, MA 02111-1307, USA.
       </varlistentry>
 
       <varlistentry>
-        <term><varname>repo-finders</varname></term>
+        <term><varname>default-repo-finders</varname></term>
         <listitem><para>Semicolon separated default list of finders (sources
         for refs) to use when pulling. This can be used to disable
         pulling from mounted filesystems, peers on the local network,

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 80b04fd574b5ff3437e987656d7e732f6761be2a..38f71486beae717e5fcb84f2f7bcc6b498d06991 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -21,7 +21,7 @@
 LIBOSTREE_2018.9 {
   ostree_mutable_tree_remove;
   ostree_repo_get_min_free_space_bytes;
-  ostree_repo_get_repo_finders;
+  ostree_repo_get_default_repo_finders;
 } LIBOSTREE_2018.7;
 
 /* Stub section for the stable release *after* this development one; don't

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index fe095057f991ba10f347e5057bfef7985c20853d..fa3c2a940f9dcbc1bbbaafc260c05d2a49a32b82 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2942,7 +2942,7 @@ reload_core_config (OstreeRepo          *self,
   { g_auto(GStrv) configured_finders = NULL;
     g_autoptr(GError) local_error = NULL;
 
-    configured_finders = g_key_file_get_string_list (self->config, "core", "repo-finders",
+    configured_finders = g_key_file_get_string_list (self->config, "core", "default-repo-finders",
                                                      NULL, &local_error);
     if (g_error_matches (local_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND))
       g_clear_error (&local_error);
@@ -2953,7 +2953,7 @@ reload_core_config (OstreeRepo          *self,
       }
 
     if (configured_finders != NULL && *configured_finders == NULL)
-      return glnx_throw (error, "Invalid empty repo-finders configuration");
+      return glnx_throw (error, "Invalid empty default-repo-finders configuration");
 
     for (char **iter = configured_finders; iter && *iter; iter++)
       {
@@ -5952,18 +5952,18 @@ ostree_repo_set_collection_id (OstreeRepo   *self,
 }
 
 /**
- * ostree_repo_get_repo_finders:
+ * ostree_repo_get_default_repo_finders:
  * @self: an #OstreeRepo
  *
- * Get the set of repo finders configured. See the documentation for
- * the "core.repo-finders" config key.
+ * Get the set of default repo finders configured. See the documentation for
+ * the "core.default-repo-finders" config key.
  *
  * Returns: (array zero-terminated=1) (element-type utf8):
  *    %NULL-terminated array of strings.
  * Since: 2018.9
  */
 const gchar * const *
-ostree_repo_get_repo_finders (OstreeRepo *self)
+ostree_repo_get_default_repo_finders (OstreeRepo *self)
 {
   g_return_val_if_fail (OSTREE_IS_REPO (self), NULL);
 

diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 2f7abf6d1c179a1898836a9cc2b85a0ae4b7d8a7..829164ba92f0eab93aa0eb430990d11e7f891d30 100644 (file)
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -113,7 +113,7 @@ gboolean      ostree_repo_set_collection_id (OstreeRepo   *self,
                                              GError      **error);
 
 _OSTREE_PUBLIC
-const gchar * const * ostree_repo_get_repo_finders (OstreeRepo   *self);
+const gchar * const * ostree_repo_get_default_repo_finders (OstreeRepo   *self);
 
 _OSTREE_PUBLIC
 GFile *       ostree_repo_get_path (OstreeRepo  *self);